merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 12 Oct 2010 13:06:17 +0000 (22:06 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 12 Oct 2010 13:06:17 +0000 (22:06 +0900)

Trivial merge